bitkeeper revision 1.1723 (42b7c4f7lKvZiHctN9YxRzuWreG0iQ)

quiet xm ssid-ref output for now - use policy tool or -l for details

diff --git a/docs/misc/shype4xen_readme.txt b/docs/misc/shype4xen_readme.txt
index e2c09a01535d44567f4bfe4bd66a41bb626e2cb9..35a2b359f3a21ba86a61aecb719496aa68887ffd 100644 (file)
--- a/docs/misc/shype4xen_readme.txt
+++ b/docs/misc/shype4xen_readme.txt
@@ -35,16 +35,6 @@ When you apply the patches and startup xen, you should at first not notice any
 difference because the default policy is the "NULL" policy, which as the name 
 implies does not enforce anything.
 
-However, when you try
-
-[root@laptop policy]# xm list
-Name              Id  Mem(MB)  CPU  State  Time(s)  Console  SSID-REF
-Domain-0           0      620   0  r----     25.6            default
-
-You might detect a new parameter "SSID-REF" displayed for domains. This 
-parameter describes the subject security identifier reference of the domain. It 
-is shown as "default" since there is no policy to be enforced.
-
 To display the currently enforced policy, use the policy tool under xeno-
 unstable.bk/tools/policy: policy_tool getpolicy. You should see output like the 
 one below.
@@ -346,7 +336,7 @@ First start xmsec1: xm create -c xmsec1 (succeeds)
 
 Then
 [root@laptop policy]# xm list 
-Name              Id  Mem(MB)  CPU  State  Time(s)  Console  SSID-REF
+Name              Id  Mem(MB)  CPU  State  Time(s)  Console  
 Domain-0           0      620   0  r----     42.3            s:00/p:00
 xmnosec            1        9   0  -b---      0.3    9601    s:00/p:05
 xmsec1             2        9   0  -b---      0.2    9602    s:01/p:01
@@ -453,7 +443,7 @@ Linux version 2.6.11-xenU (root@laptop.home.org) (gcc version 3.4.2 20041017
 .
 .
 [root@laptop policy]# xm list
-Name              Id  Mem(MB)  CPU  State  Time(s)  Console  SSID-REF
+Name              Id  Mem(MB)  CPU  State  Time(s)  Console  
 Domain-0           0      620   0  r----     71.7            s:00/p:00
 xmsec1             1        9   0  -b---      0.3    9601    s:01/p:01
 xmsec2             2        7   0  -b---      0.3    9602    s:02/p:02   << our domain runs both policies with ssidref 2
@@ -577,4 +567,4 @@ is that policy files/management should be portable and independent of the platfo
 Our policy interface enables managers to create a single binary policy file in a trusted
 environment and distributed it to multiple systems for enforcement.
 
-====================end-of file=======================================
\ No newline at end of file
+====================end-of file=======================================

diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 6eda17e2a97f16ca276bf02046a9fdf2d80e4671..64716082b5783e7cc87fe55ca15867e435298c92 100644 (file)
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -383,7 +383,7 @@ class ProgList(Prog):
             self.brief_list(doms)
 
     def brief_list(self, doms):
-        print 'Name              Id  Mem(MB)  CPU VCPU(s)  State  Time(s)  Console  SSID-REF'
+        print 'Name              Id  Mem(MB)  CPU VCPU(s)  State  Time(s)  Console'
         for dom in doms:
             info = server.xend_domain(dom)
             d = {}
@@ -404,7 +404,7 @@ class ProgList(Prog):
                 d['ssidref2'] = (int(sxp.child_value(info, 'ssidref', '-1')) >> 16) & 0xffff
                 print ("%(name)-16s %(dom)3d  %(mem)7d  %(cpu)3d  %(vcpus)5d   %(state)5s  %(cpu_time)7.1f     %(port)4s    s:%(ssidref2)02x/p:%(ssidref1)02x" % d)
             else:
-                print ("%(name)-16s %(dom)3d  %(mem)7d  %(cpu)3d  %(vcpus)5d   %(state)5s  %(cpu_time)7.1f     %(port)4s     default" % d)
+                print ("%(name)-16s %(dom)3d  %(mem)7d  %(cpu)3d  %(vcpus)5d   %(state)5s  %(cpu_time)7.1f     %(port)4s" % d)
 
     def show_vcpus(self, doms):
         print 'Name              Id  VCPU  CPU  CPUMAP'